From 955736421667e2aaadc4e4949742a99391bcc302 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Sat, 15 Oct 2016 21:29:45 +0100 Subject: [PATCH] gtk: Mark internal functions as static These functions are only used within their compilation unit. --- gtk/gtkcontainer.c | 2 +- gtk/gtkcssanimation.c | 2 +- gtk/gtkcsscalcvalue.c | 4 ++-- gtk/gtkcssimagebuiltin.c | 6 +++--- gtk/gtkcssnode.c | 4 ++-- gtk/gtkcsspathnode.c | 2 +- gtk/gtkcssshadowvalue.c | 14 ++++++++------ gtk/gtkcsswidgetnode.c | 2 +- gtk/gtkimcontextsimple.c | 2 +- gtk/gtkprintoperation-portal.c | 2 +- gtk/gtkrendericon.c | 2 +- gtk/gtksearchenginemodel.c | 2 +- 12 files changed, 23 insertions(+), 21 deletions(-) diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c index 59c3e722e1..7e549c4496 100644 --- a/gtk/gtkcontainer.c +++ b/gtk/gtkcontainer.c @@ -2252,7 +2252,7 @@ get_focus_chain (GtkContainer *container) /* same as gtk_container_get_children, except it includes internals */ -GList * +static GList * gtk_container_get_all_children (GtkContainer *container) { GList *children = NULL; diff --git a/gtk/gtkcssanimation.c b/gtk/gtkcssanimation.c index e55df39745..dab839d6a3 100644 --- a/gtk/gtkcssanimation.c +++ b/gtk/gtkcssanimation.c @@ -76,7 +76,7 @@ gtk_css_animation_get_progress (GtkCssAnimation *animation) return gtk_progress_tracker_get_progress (&animation->tracker, reverse); } -GtkStyleAnimation * +static GtkStyleAnimation * gtk_css_animation_advance (GtkStyleAnimation *style_animation, gint64 timestamp) { diff --git a/gtk/gtkcsscalcvalue.c b/gtk/gtkcsscalcvalue.c index 2004fbac53..b88751beb6 100644 --- a/gtk/gtkcsscalcvalue.c +++ b/gtk/gtkcsscalcvalue.c @@ -310,7 +310,7 @@ gtk_css_calc_value_new_sum (GtkCssValue *value1, GtkCssValue * gtk_css_calc_value_parse_sum (GtkCssParser *parser, GtkCssNumberParseFlags flags); -GtkCssValue * +static GtkCssValue * gtk_css_calc_value_parse_value (GtkCssParser *parser, GtkCssNumberParseFlags flags) { @@ -346,7 +346,7 @@ is_number (GtkCssValue *value) && !gtk_css_number_value_has_percent (value); } -GtkCssValue * +static GtkCssValue * gtk_css_calc_value_parse_product (GtkCssParser *parser, GtkCssNumberParseFlags flags) { diff --git a/gtk/gtkcssimagebuiltin.c b/gtk/gtkcssimagebuiltin.c index fe0f652211..365b9255d0 100644 --- a/gtk/gtkcssimagebuiltin.c +++ b/gtk/gtkcssimagebuiltin.c @@ -376,7 +376,7 @@ add_path_line (cairo_t *cr, cairo_line_to (cr, x2, y2); } -void +static void gtk_css_image_builtin_draw_grip (GtkCssImage *image, cairo_t *cr, double width, @@ -627,7 +627,7 @@ gtk_css_image_builtin_draw_grip (GtkCssImage *image, } } -void +static void gtk_css_image_builtin_draw_pane_separator (GtkCssImage *image, cairo_t *cr, double width, @@ -650,7 +650,7 @@ gtk_css_image_builtin_draw_pane_separator (GtkCssImage *image, render_dot (cr, &lighter, &darker, width / 2 - 1, yy, 3); } -void +static void gtk_css_image_builtin_draw_handle (GtkCssImage *image, cairo_t *cr, double width, diff --git a/gtk/gtkcssnode.c b/gtk/gtkcssnode.c index 519c8b7533..a923d8d45c 100644 --- a/gtk/gtkcssnode.c +++ b/gtk/gtkcssnode.c @@ -474,7 +474,7 @@ gtk_css_node_real_validate (GtkCssNode *node) { } -gboolean +static gboolean gtk_css_node_real_init_matcher (GtkCssNode *cssnode, GtkCssMatcher *matcher) { @@ -1338,7 +1338,7 @@ gtk_css_node_invalidate (GtkCssNode *cssnode, gtk_css_node_invalidate_style (cssnode); } -void +static void gtk_css_node_validate_internal (GtkCssNode *cssnode, gint64 timestamp) { diff --git a/gtk/gtkcsspathnode.c b/gtk/gtkcsspathnode.c index 0f2d14adb3..f5caea8e44 100644 --- a/gtk/gtkcsspathnode.c +++ b/gtk/gtkcsspathnode.c @@ -44,7 +44,7 @@ gtk_css_path_node_invalidate (GtkCssNode *node) gtk_style_context_validate (path_node->context, NULL); } -gboolean +static gboolean gtk_css_path_node_real_init_matcher (GtkCssNode *node, GtkCssMatcher *matcher) { diff --git a/gtk/gtkcssshadowvalue.c b/gtk/gtkcssshadowvalue.c index 35d3df764a..42566a401c 100644 --- a/gtk/gtkcssshadowvalue.c +++ b/gtk/gtkcssshadowvalue.c @@ -373,18 +373,18 @@ gtk_css_shadow_value_start_drawing (const GtkCssValue *shadow, return blur_cr; } -void +static void mask_surface_repeat (cairo_t *cr, cairo_surface_t *surface) { - cairo_pattern_t *pattern; + cairo_pattern_t *pattern; - pattern = cairo_pattern_create_for_surface (surface); - cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT); + pattern = cairo_pattern_create_for_surface (surface); + cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT); - cairo_mask (cr, pattern); + cairo_mask (cr, pattern); - cairo_pattern_destroy (pattern); + cairo_pattern_destroy (pattern); } static cairo_t * @@ -422,6 +422,8 @@ gtk_css_shadow_value_finish_drawing (const GtkCssValue *shadow, static const cairo_user_data_key_t radius_key; static const cairo_user_data_key_t layout_serial_key; +GQuark pango_cached_blurred_surface_quark (void); + G_DEFINE_QUARK (GtkCssShadowValue pango_cached_blurred_surface, pango_cached_blurred_surface) static cairo_surface_t * diff --git a/gtk/gtkcsswidgetnode.c b/gtk/gtkcsswidgetnode.c index e2db2eface..3983e8384e 100644 --- a/gtk/gtkcsswidgetnode.c +++ b/gtk/gtkcsswidgetnode.c @@ -178,7 +178,7 @@ widget_needs_widget_path (GtkWidget *widget) return TRUE; } -gboolean +static gboolean gtk_css_widget_node_init_matcher (GtkCssNode *node, GtkCssMatcher *matcher) { diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c index a04224e14c..c0c7da7e98 100644 --- a/gtk/gtkimcontextsimple.c +++ b/gtk/gtkimcontextsimple.c @@ -243,7 +243,7 @@ init_compose_table_thread_cb (GTask *task, gtk_im_context_simple_init_compose_table (GTK_IM_CONTEXT_SIMPLE (task_data)); } -void +static void init_compose_table_async (GtkIMContextSimple *im_context_simple, GCancellable *cancellable, GAsyncReadyCallback callback, diff --git a/gtk/gtkprintoperation-portal.c b/gtk/gtkprintoperation-portal.c index 774ca6040a..1272767ce9 100644 --- a/gtk/gtkprintoperation-portal.c +++ b/gtk/gtkprintoperation-portal.c @@ -467,7 +467,7 @@ prepare_print_called (GObject *source, g_variant_unref (ret); } -PortalData * +static PortalData * create_portal_data (GtkPrintOperation *op, GtkWindow *parent, GtkPrintOperationPrintFunc print_cb) diff --git a/gtk/gtkrendericon.c b/gtk/gtkrendericon.c index cacd5109c4..b2ca78aeb6 100644 --- a/gtk/gtkrendericon.c +++ b/gtk/gtkrendericon.c @@ -81,7 +81,7 @@ gtk_css_style_render_icon (GtkCssStyle *style, cairo_set_matrix (cr, &saved_matrix); } -gboolean +static gboolean get_surface_extents (cairo_surface_t *surface, GdkRectangle *out_extents) { diff --git a/gtk/gtksearchenginemodel.c b/gtk/gtksearchenginemodel.c index dae99f2ba3..6dd735db03 100644 --- a/gtk/gtksearchenginemodel.c +++ b/gtk/gtksearchenginemodel.c @@ -59,7 +59,7 @@ gtk_search_engine_model_dispose (GObject *object) G_OBJECT_CLASS (_gtk_search_engine_model_parent_class)->dispose (object); } -gboolean +static gboolean info_matches_query (GtkQuery *query, GFileInfo *info) { -- 2.30.2